Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 22 Jun 2011 21:52:08 +0000 (14:52 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 22 Jun 2011 21:52:08 +0000 (14:52 -0700)
commitffd3134c876d261991c77c6d1ea7b8524a1af2d6
treebf0a5ce775266e529d7190a79686328064c62b62
parent607dfdeba52a4932303e981cba98628dd1677ad3
parentb8b5febf0c007f79f66b8b7a43264f7af8f2541f
Merge from trunk.